gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Don't

fail if iter is NULL. (#58347)

diff --git a/ChangeLog b/ChangeLog
index b6864c0155c85c1c098b068e5d2b5d659690b22f..8081f8a585f73b563318899b04a34d33f4a89e77 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2001-08-07    <matthiasc@waldgeist.poet.de>
+2001-08-08  Matthias Clasen  <matthiasc@waldgeist.poet.de>
+
+       * gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Don't
+       fail if iter is NULL. (#58347)
+
+2001-08-07  Matthias Clasen  <matthiasc@waldgeist.poet.de>
 
        * gtk/gtktextdisplay.c (render_para, gtk_text_layout_draw): Fix
        some off-by-one issues, fixing selection of line-ends. (#50323)

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b6864c0155c85c1c098b068e5d2b5d659690b22f..8081f8a585f73b563318899b04a34d33f4a89e77 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,4 +1,9 @@
-2001-08-07    <matthiasc@waldgeist.poet.de>
+2001-08-08  Matthias Clasen  <matthiasc@waldgeist.poet.de>
+
+       * gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Don't
+       fail if iter is NULL. (#58347)
+
+2001-08-07  Matthias Clasen  <matthiasc@waldgeist.poet.de>
 
        * gtk/gtktextdisplay.c (render_para, gtk_text_layout_draw): Fix
        some off-by-one issues, fixing selection of line-ends. (#50323)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b6864c0155c85c1c098b068e5d2b5d659690b22f..8081f8a585f73b563318899b04a34d33f4a89e77 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,4 +1,9 @@
-2001-08-07    <matthiasc@waldgeist.poet.de>
+2001-08-08  Matthias Clasen  <matthiasc@waldgeist.poet.de>
+
+       * gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Don't
+       fail if iter is NULL. (#58347)
+
+2001-08-07  Matthias Clasen  <matthiasc@waldgeist.poet.de>
 
        * gtk/gtktextdisplay.c (render_para, gtk_text_layout_draw): Fix
        some off-by-one issues, fixing selection of line-ends. (#50323)

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b6864c0155c85c1c098b068e5d2b5d659690b22f..8081f8a585f73b563318899b04a34d33f4a89e77 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,4 +1,9 @@
-2001-08-07    <matthiasc@waldgeist.poet.de>
+2001-08-08  Matthias Clasen  <matthiasc@waldgeist.poet.de>
+
+       * gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Don't
+       fail if iter is NULL. (#58347)
+
+2001-08-07  Matthias Clasen  <matthiasc@waldgeist.poet.de>
 
        * gtk/gtktextdisplay.c (render_para, gtk_text_layout_draw): Fix
        some off-by-one issues, fixing selection of line-ends. (#50323)

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b6864c0155c85c1c098b068e5d2b5d659690b22f..8081f8a585f73b563318899b04a34d33f4a89e77 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,4 +1,9 @@
-2001-08-07    <matthiasc@waldgeist.poet.de>
+2001-08-08  Matthias Clasen  <matthiasc@waldgeist.poet.de>
+
+       * gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Don't
+       fail if iter is NULL. (#58347)
+
+2001-08-07  Matthias Clasen  <matthiasc@waldgeist.poet.de>
 
        * gtk/gtktextdisplay.c (render_para, gtk_text_layout_draw): Fix
        some off-by-one issues, fixing selection of line-ends. (#50323)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b6864c0155c85c1c098b068e5d2b5d659690b22f..8081f8a585f73b563318899b04a34d33f4a89e77 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,4 +1,9 @@
-2001-08-07    <matthiasc@waldgeist.poet.de>
+2001-08-08  Matthias Clasen  <matthiasc@waldgeist.poet.de>
+
+       * gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Don't
+       fail if iter is NULL. (#58347)
+
+2001-08-07  Matthias Clasen  <matthiasc@waldgeist.poet.de>
 
        * gtk/gtktextdisplay.c (render_para, gtk_text_layout_draw): Fix
        some off-by-one issues, fixing selection of line-ends. (#50323)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b6864c0155c85c1c098b068e5d2b5d659690b22f..8081f8a585f73b563318899b04a34d33f4a89e77 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,4 +1,9 @@
-2001-08-07    <matthiasc@waldgeist.poet.de>
+2001-08-08  Matthias Clasen  <matthiasc@waldgeist.poet.de>
+
+       * gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Don't
+       fail if iter is NULL. (#58347)
+
+2001-08-07  Matthias Clasen  <matthiasc@waldgeist.poet.de>
 
        * gtk/gtktextdisplay.c (render_para, gtk_text_layout_draw): Fix
        some off-by-one issues, fixing selection of line-ends. (#50323)

diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index 598391a8191d71640d5fae75c0adf57a9f12a470..a017a655e2e086bdc65395613454bba99d2358c6 100644 (file)
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -609,8 +609,7 @@ gtk_tree_store_iter_n_children (GtkTreeModel *tree_model,
   gint i = 0;
 
   g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), 0);
-  g_return_val_if_fail (iter != NULL, FALSE);
-  g_return_val_if_fail (iter->user_data != NULL, FALSE);
+  g_return_val_if_fail (iter == NULL || iter->user_data != NULL, FALSE);
 
   if (iter == NULL)
     node = G_NODE (GTK_TREE_STORE (tree_model)->root)->children;